Remove Gtk 2 compatibility code

It is useless now that we require Gtk 3.

https://bugzilla.gnome.org/show_bug.cgi?id=638315

diff --git a/src/Makefile-tray.am b/src/Makefile-tray.am
index 6634324f853f3c96c79dd825484c34de9a3064f7..1377e0c343f53006d738e69a2d63c207d3dfea74 100644 (file)
--- a/src/Makefile-tray.am
+++ b/src/Makefile-tray.am
@@ -15,7 +15,6 @@ TRAY_STAMP_FILES = stamp-na-marshal.h
 
 # please, keep this sorted alphabetically
 tray_source =                  \
-       gtk-compat.h            \
        tray/na-tray-child.c    \
        tray/na-tray-child.h    \
        tray/na-tray-manager.c  \

diff --git a/src/Makefile.am b/src/Makefile.am
index 61b58260ab210df7f42193353926ae3e0e2102aa..e79a486fe87a26eadd87d1696d003d15f867cb75 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,7 +90,6 @@ libgnome_shell_la_SOURCES =           \
        shell-window-tracker-private.h  \
        shell-wm-private.h              \
        gnome-shell-plugin.c            \
-       gtk-compat.h                    \
        shell-app.c                     \
        shell-app-system.c              \
        shell-app-usage.c               \

diff --git a/src/gtk-compat.h b/src/gtk-compat.h
deleted file mode 100644 (file)
index 9515205..0000000
--- a/src/gtk-compat.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __GTK_COMPAT_H__
-#define __GTK_COMPAT_H__
-
-#include <gtk/gtk.h>
-
-/* Provide a compatibility layer for accessor functions introduced
- * in GTK+ 2.20 which we need to build with GSEAL_ENABLE.
- * That way it is still possible to build with GTK+ 2.18 when not
- * using GSEAL_ENABLE
- */
-
-#if !GTK_CHECK_VERSION(2, 20, 0)
-
-#define gtk_widget_get_realized(w) GTK_WIDGET_REALIZED (w)
-#define gtk_widget_get_mapped(w)   GTK_WIDGET_MAPPED (w)
-
-#endif /* GTK_CHECK_VERSION(2, 20, 0) */
-
-#endif /* __GTK_COMPAT_H__ */

diff --git a/src/shell-embedded-window.c b/src/shell-embedded-window.c
index 01a5a4d27e69985092ec4a7db0ba24931e4647e2..a87844842000cf80e6623889da643572646d3a94 100644 (file)
--- a/src/shell-embedded-window.c
+++ b/src/shell-embedded-window.c
@@ -6,7 +6,6 @@
 #include <clutter/x11/clutter-x11.h>
 
 #include "shell-embedded-window-private.h"
-#include "gtk-compat.h"
 
 /* This type is a subclass of GtkWindow that ties the window to a
  * ShellGtkEmbed; the window is reparented into the stage

diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
index a7c7bbe1004be638cf04a22bc25ca2df88a40c3f..613397fb5856519a3f8696a1748d5a4902852f46 100644 (file)
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@@ -3,7 +3,6 @@
 #include "config.h"
 
 #include "shell-embedded-window-private.h"
-#include "gtk-compat.h"
 
 #include <gdk/gdkx.h>
 

diff --git a/src/shell-tray-icon.c b/src/shell-tray-icon.c
index dce8630f701448f6789e6034d57cbb693b8cdd43..079a48e511bd6f8018b662e46a317106692e0e0d 100644 (file)
--- a/src/shell-tray-icon.c
+++ b/src/shell-tray-icon.c
@@ -5,7 +5,6 @@
 #include "shell-tray-icon.h"
 #include "shell-gtk-embed.h"
 #include "shell-window-tracker.h"
-#include "gtk-compat.h"
 #include "tray/na-tray-child.h"
 #include <gdk/gdkx.h>
 #include "st.h"

diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c
index 37db2e0eda03eb3a2c9314cb3e5bcbd9d6d7d9ca..36cd4a0646610918f54dfeeb6ef96704d9ea1859 100644 (file)
--- a/src/tray/na-tray-child.c
+++ b/src/tray/na-tray-child.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include "na-tray-child.h"
-#include "gtk-compat.h"
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>

diff --git a/src/tray/na-tray-manager.c b/src/tray/na-tray-manager.c
index d53c90206aa27e5c866b98e40c48d319a494d50c..86e3ef33ebb8ea7ed64704cd8df0dd0c565b2f2d 100644 (file)
--- a/src/tray/na-tray-manager.c
+++ b/src/tray/na-tray-manager.c
@@ -25,7 +25,6 @@
 #include <libintl.h>
 
 #include "na-tray-manager.h"
-#include "gtk-compat.h"
 
 #include <glib/gi18n-lib.h>
 #if defined (GDK_WINDOWING_X11)